Merge from trunk.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 14 Apr 2012 05:16:02 +0000 (22:16 -0700)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 14 Apr 2012 05:16:02 +0000 (22:16 -0700)
commitb2b80c20c822762be1bce5b50f0e5913a006efd1
treef88c8a28774996e3108c16b4898656c44c5f3615
parentaa287096355198d9621b7b2ce7c683ef627b03a2
parent16f49b929b8492e35f285a5163f5cf08650773dc
Merge from trunk.